merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 27 Jul 2007 14:15:16 +0000 (08:15 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 27 Jul 2007 14:15:16 +0000 (08:15 -0600)
commitf989c55e7d62bacd4aad8cd1e2b2867257a1f8da
tree526c717d84aeaca6a78666247c33c7d2d76b62d6
parentfa184de0eab63b481367defe41b3a7d10ae5ac57
parentf11a11ff7b1a747d2c4ec8a8be217eb93b68214f
merge with xen-unstable.hg